Don't BUG_ON() if we cannot register an NMI callback since it is not a fatal

problem.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>

diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h
index a349bb18a0ddae14aecc96805ab0ab3be183d7af..279bd5a34848903dddc68700e5cdcf5428cf7283 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h
@@ -60,9 +60,8 @@ static void __init machine_specific_arch_setup(void)
                struct xennmi_callback cb;
 
                cb.handler_address = nmi_cb.address.eip;
-               ret = HYPERVISOR_nmi_op(XENNMI_register_callback, &cb);
+               HYPERVISOR_nmi_op(XENNMI_register_callback, &cb);
        }
-       BUG_ON(ret);
 
        if (HYPERVISOR_xen_version(XENVER_platform_parameters,
                                   &pp) == 0)

diff --git a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h
index aca5ba7e658ecc1a8a9998a80aa9ada4672056f0..e21d4ee6f21cfcf72bf38abc55459b5b8fb7af9e 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h
+++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h
@@ -52,8 +52,7 @@ static void __init machine_specific_arch_setup(void)
                struct xennmi_callback cb;
 
                cb.handler_address = nmi_cb.address;
-               ret = HYPERVISOR_nmi_op(XENNMI_register_callback, &cb);
+               HYPERVISOR_nmi_op(XENNMI_register_callback, &cb);
        }
-       BUG_ON(ret);
 #endif
 }